From f0a0fd005aeb273caade9d92bfc4bb2e5da7bb84 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@gmail.com>
Date: Thu, 2 Jan 2014 04:58:53 +0000
Subject: [PATCH] Fix mapbar.

---
 gpsbabel/mapbar_track.cc | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/gpsbabel/mapbar_track.cc b/gpsbabel/mapbar_track.cc
index daa24ced3..05f35abfd 100644
--- a/gpsbabel/mapbar_track.cc
+++ b/gpsbabel/mapbar_track.cc
@@ -88,14 +88,11 @@ mapbar_track_read(void)
   (void) read_datetime(); // start_time currently unused
   (void) read_datetime(); // end_time currently unused
 
-  char name[200] = {0};
+  ushort name[200] = {0};
   gbfread((void*)name, 1, 200, fin);
   // At this point, name is a UCS-16 encoded, zero terminated string.
-  // All our internals use UTF-8 encoding, so convert now.
-  int olen = strlen(name);
-
-  QScopedPointer<char, QScopedPointerPodDeleter>rte_name (cet_str_uni_to_utf8((const short int*) name, olen));
-  track->rte_name = rte_name.take();
+  // All our internals use Qt encoding, so convert now.
+  track->rte_name = QString().fromUtf16(name);
 
   // skip two pair waypoint
   gbfseek(fin, 8*4, SEEK_CUR);
-- 
2.30.2